Merge "Use ConnectivityManager.MockHelpers" into main